gdk/win32/gdkevents-win32.c Fixed two declarations in the middle of a

2008-02-07  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c
        * gdk/win32/gdkwindow-win32.c: Fixed two declarations in the middle
        of a block that were causing compile problems on old
        compilers. (#515053, reported by Kazuki IWAMOTO)

svn path=/trunk/; revision=19493

diff --git a/ChangeLog b/ChangeLog
index 5c72e6ecb82c7e2b4aa6bdc6ac0c6964dfbb258b..085a0c9a300983d5a8493bfc713d0184f7f80c45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-07  Cody Russell  <bratsche@gnome.org>
+
+       * gdk/win32/gdkevents-win32.c
+       * gdk/win32/gdkwindow-win32.c: Fixed two declarations in the middle
+       of a block that were causing compile problems on old
+       compilers. (#515053, reported by Kazuki IWAMOTO)
+       
 2008-02-07  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkcellview.c

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 0e2be650c73b7fa158524be80356f6de0d8a45df..8aa7c2125d3f63987e08fc2513ae9b99224f1c0e 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2813,23 +2813,27 @@ gdk_event_translate (MSG  *msg,
       break;
 
      case WM_MOUSEACTIVATE:
-       if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
-          || !((GdkWindowObject *)window)->accept_focus)
-        {
-          *ret_valp = MA_NOACTIVATE;
-          return_val = TRUE;
-        }
-
-       GdkWindow *tmp = _gdk_modal_current ();
-
-       if (tmp != NULL)
-        {
-          if (gdk_window_get_toplevel (window) != tmp)
-            {
-              *ret_valp = MA_NOACTIVATEANDEAT;
-              return_val = TRUE;
-            }
-        }
+       {
+        GdkWindow *tmp;
+
+        if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
+            || !((GdkWindowObject *)window)->accept_focus)
+          {
+            *ret_valp = MA_NOACTIVATE;
+            return_val = TRUE;
+          }
+
+        tmp = _gdk_modal_current ();
+
+        if (tmp != NULL)
+          {
+            if (gdk_window_get_toplevel (window) != tmp)
+              {
+                *ret_valp = MA_NOACTIVATEANDEAT;
+                return_val = TRUE;
+              }
+          }
+       }
 
        break;
 

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 0bcaeba22cccc99b366b0e37fc7c850ca118978a..4586edb1ea7a573a298891d1483523771a765603 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2045,6 +2045,8 @@ _gdk_push_modal_window (GdkWindow *window)
 void
 _gdk_remove_modal_window (GdkWindow *window)
 {
+  GSList *tmp;
+
   g_return_if_fail (window != NULL);
 
   /* It's possible to be NULL here if someone sets the modal hint of the window
@@ -2054,7 +2056,7 @@ _gdk_remove_modal_window (GdkWindow *window)
 
   /* Find the requested window in the stack and remove it.  Yeah, I realize this
    * means we're not a 'real stack', strictly speaking.  Sue me. :) */
-  GSList *tmp = g_slist_find (modal_window_stack, window);
+  tmp = g_slist_find (modal_window_stack, window);
   if (tmp != NULL)
     {
       modal_window_stack = g_slist_delete_link (modal_window_stack, tmp);